a42327b01e3a256a5e739ed15748da50229d97cf,portal-service/test/com/liferay/portal/kernel/util/RecurrenceYearlyTest.java,RecurrenceYearlyTest,testByDayAndMonth,#,99

Before Change


	}

	public void testByDayAndMonth() throws Exception {
		Recurrence recurrence = new Recurrence(
			getCalendar(2009, MARCH, 23, HOUR_DURING, MINUTE_DURING),
			getDefaultDuration(), Recurrence.YEARLY);

		DayAndPosition[] dayPos = {
			new DayAndPosition(MONDAY, 0),
			new DayAndPosition(FRIDAY, 4)};

		int[] months = {JANUARY, MARCH, MAY};

		recurrence.setByDay(dayPos);
		recurrence.setByMonth(months);

		assertIsInRecurrence(true, recurrence, 2009, MARCH, 23);
		assertIsInRecurrence(false, recurrence, 2009, MARCH, 26);
		//assertIsInRecurrence(true, recurrence, 2009, MARCH, 27);
		assertIsInRecurrence(true, recurrence, 2009, MARCH, 30);
		assertIsInRecurrence(false, recurrence, 2009, MARCH, 31);
		assertIsInRecurrence(false, recurrence, 2009, APRIL, 6);
		//assertIsInRecurrence(true, recurrence, 2009, APRIL, 24);
		assertIsInRecurrence(true, recurrence, 2009, MAY, 18);
		//assertIsInRecurrence(true, recurrence, 2009, MAY, 22);
		assertIsInRecurrence(false, recurrence, 2009, MAY, 29);
		assertIsInRecurrence(true, recurrence, 2010, JANUARY, 11);
		assertIsInRecurrence(true, recurrence, 2010, JANUARY, 22);
		assertIsInRecurrence(true, recurrence, 2010, MARCH, 22);
		assertIsInRecurrence(false, recurrence, 2010, MARCH, 23);
		//assertIsInRecurrence(true, recurrence, 2010, MARCH, 26);
		assertIsInRecurrence(true, recurrence, 2011, MARCH, 21);
		//assertIsInRecurrence(true, recurrence, 2011, MARCH, 25);
		//assertIsInRecurrence(true, recurrence, 2012, MARCH, 23);
		//assertIsInRecurrence(true, recurrence, 2013, MARCH, 22);
		assertIsInRecurrence(true, recurrence, 2013, MARCH, 25);

		// Interval

		recurrence.setInterval(2);

		assertIsInRecurrence(true, recurrence, 2009, MARCH, 23);
		assertIsInRecurrence(false, recurrence, 2009, MARCH, 26);
		//assertIsInRecurrence(true, recurrence, 2009, MARCH, 27);
		assertIsInRecurrence(true, recurrence, 2009, MARCH, 30);
		assertIsInRecurrence(false, recurrence, 2009, MARCH, 31);
		assertIsInRecurrence(false, recurrence, 2009, APRIL, 6);
		//assertIsInRecurrence(true, recurrence, 2009, APRIL, 24);
		assertIsInRecurrence(true, recurrence, 2009, MAY, 18);
		//assertIsInRecurrence(true, recurrence, 2009, MAY, 22);
		assertIsInRecurrence(false, recurrence, 2009, MAY, 29);
		assertIsInRecurrence(false, recurrence, 2010, JANUARY, 11);
		assertIsInRecurrence(false, recurrence, 2010, JANUARY, 22);
		assertIsInRecurrence(false, recurrence, 2010, MARCH, 22);
		assertIsInRecurrence(false, recurrence, 2010, MARCH, 23);
		assertIsInRecurrence(false, recurrence, 2010, MARCH, 26);
		assertIsInRecurrence(true, recurrence, 2011, MARCH, 21);
		//assertIsInRecurrence(true, recurrence, 2011, MARCH, 25);
		assertIsInRecurrence(false, recurrence, 2012, MARCH, 23);
		//assertIsInRecurrence(true, recurrence, 2013, MARCH, 22);
		assertIsInRecurrence(true, recurrence, 2013, MARCH, 25);

		// End date

		recurrence.setUntil(getCalendar(2013, MARCH, 25, 0, 0));

		//assertIsInRecurrence(true, recurrence, 2013, MARCH, 22);
		assertIsInRecurrence(false, recurrence, 2013, MARCH, 25);

		// Occurrence

		recurrence.setOccurrence(2);

		//assertIsInRecurrence(true, recurrence, 2009, MARCH, 27);
		//assertIsInRecurrence(false, recurrence, 2009, MARCH, 30);

After Change


	public void testByMonthAndMonthDayDuringSecondRecurrenceWithUntil()
		throws Exception {

		Recurrence recurrence = _getRecurrenceByMonthAndMonthDay(
			_DT_START, DURATION_ONE_HOUR, FEBRUARY, 15, 1);

		recurrence.setUntil(getCalendar(2008, MARCH, 15, 22, 10));

		Calendar testCalendar = getCalendar(2009, FEBRUARY, 15, 22, 15);